Fix merge error.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f3404816ad6016afc9b376616b767375cbaa62f4..e0a68e182a6250597e862db9e691facc55ff742d 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -122,10 +122,6 @@
 
        * mm-util.el (mm-charset-override-alist): Declare for compiler.
 
-2008-12-16  Glenn Morris  <rgm@gnu.org>
-
-       * mm-util.el (mm-charset-override-alist): Declare for compiler.
-
 2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs